From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 13 May 2008 11:43:24 +0000 (+0100)
Subject: Xend: Fix blkif type check for tap devices.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14215^2~14
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=ef6666a9b0e40842d6d7490bb3a8866f53f21187;p=xen.git

Xend: Fix blkif type check for tap devices.

Signed-off-by: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>
---

diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py
index 82853d6fbf..a94bc66b3a 100644
--- a/tools/python/xen/xend/server/blkif.py
+++ b/tools/python/xen/xend/server/blkif.py
@@ -56,9 +56,10 @@ class BlkifController(DevController):
         else:
             try:
                 (typ, params) = string.split(uname, ':', 1)
-                if typ not in ('phy', 'file'):
+                if typ not in ('phy', 'file', 'tap'):
                     raise VmError(
-                        'Block device must have "phy" or "file" specified to type')
+                        'Block device must have "phy", "file" or "tap" '
+                        'specified to type')
             except ValueError:
                 raise VmError(
                     'Block device must have physical details specified')